Adapt to api changes in GMenuModel

diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 247eac87d862736898605facea2b3dd0e4acf838..38d2e9ca8ab051392a63ce8825c321c1233eb9bf 100644 (file)
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -458,8 +458,9 @@ radio_state_changed (GActionGroup     *group,
 }
 
 static GtkWidget *
-create_menuitem_from_model (GMenuModelItem *item,
-                            GActionGroup   *group)
+create_menuitem_from_model (GMenuModel   *model,
+                            gint          item,
+                            GActionGroup *group)
 {
   GtkWidget *w;
   gchar *label;
@@ -470,10 +471,10 @@ create_menuitem_from_model (GMenuModelItem *item,
   const GVariantType *type;
   GVariant *v;
 
-  g_menu_model_item_get_attribute (item, G_MENU_ATTRIBUTE_LABEL, "s", &label);
+  g_menu_model_get_item_attribute (model, item, G_MENU_ATTRIBUTE_LABEL, "s", &label);
 
   action = NULL;
-  g_menu_model_item_get_attribute (item, G_MENU_ATTRIBUTE_ACTION, "s", &action);
+  g_menu_model_get_item_attribute (model, item, G_MENU_ATTRIBUTE_ACTION, "s", &action);
 
   if (action != NULL)
     type = g_action_group_get_action_state_type (group, action);
@@ -528,7 +529,7 @@ create_menuitem_from_model (GMenuModelItem *item,
           a->state_changed_id = g_signal_connect (group, s,
                                                   G_CALLBACK (radio_state_changed), w);
           g_free (s);
-          g_menu_model_item_get_attribute (item, G_MENU_ATTRIBUTE_TARGET, "s", &target);
+          g_menu_model_get_item_attribute (model, item, G_MENU_ATTRIBUTE_TARGET, "s", &target);
           a->target = g_strdup (target);
           v = g_action_group_get_action_state (group, action);
           gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w),
@@ -561,7 +562,6 @@ append_items_from_model (GtkMenuShell *menu,
   GtkWidget *w;
   GtkWidget *menuitem;
   GtkWidget *submenu;
-  GMenuModelItem item;
   GMenuModel *m;
 
   n = g_menu_model_get_n_items (model);
@@ -577,18 +577,16 @@ append_items_from_model (GtkMenuShell *menu,
 
   for (i = 0; i < n; i++)
     {
-      g_menu_model_get_item (model, i, &item);
-
-      if ((m = g_menu_model_item_get_link (&item, G_MENU_LINK_SECTION)))
+      if ((m = g_menu_model_get_item_link (model, i, G_MENU_LINK_SECTION)))
         {
           append_items_from_model (menu, m, group, need_separator);
           g_object_unref (m);
           continue;
         }
 
-      menuitem = create_menuitem_from_model (&item, group);
+      menuitem = create_menuitem_from_model (model, i, group);
 
-      if ((m = g_menu_model_item_get_link (&item, G_MENU_LINK_SUBMENU)))
+      if ((m = g_menu_model_get_item_link (model, i, G_MENU_LINK_SUBMENU)))
         {
           submenu = gtk_menu_new ();
           populate_menu_from_model (GTK_MENU_SHELL (submenu), m, group);

diff --git a/tests/testgmenu.c b/tests/testgmenu.c
index 71006addf3bfddf492e9dc1a65100da19dd30bfb..1908402990b529eddceb041c2aa9db3916478d0e 100644 (file)
--- a/tests/testgmenu.c
+++ b/tests/testgmenu.c
@@ -193,8 +193,9 @@ radio_item_toggled (GtkCheckMenuItem *w,
 /* GtkMenu construction {{{2 */
 
 static GtkWidget *
-create_menuitem_from_model (GMenuModelItem *item,
-                            GActionGroup   *group)
+create_menuitem_from_model (GMenuModel   *model,
+                            gint          item,
+                            GActionGroup *group)
 {
   GtkWidget *w;
   gchar *label;
@@ -205,10 +206,10 @@ create_menuitem_from_model (GMenuModelItem *item,
   const GVariantType *type;
   GVariant *v;
 
-  g_menu_model_item_get_attribute (item, G_MENU_ATTRIBUTE_LABEL, "s", &label);
+  g_menu_model_get_item_attribute (model, item, G_MENU_ATTRIBUTE_LABEL, "s", &label);
 
   action = NULL;
-  g_menu_model_item_get_attribute (item, G_MENU_ATTRIBUTE_ACTION, "s", &action);
+  g_menu_model_get_item_attribute (model, item, G_MENU_ATTRIBUTE_ACTION, "s", &action);
 
   if (action != NULL)
     type = g_action_group_get_action_state_type (group, action);
@@ -263,7 +264,7 @@ create_menuitem_from_model (GMenuModelItem *item,
           a->state_changed_id = g_signal_connect (group, s,
                                                   G_CALLBACK (radio_state_changed), w);
           g_free (s);
-          g_menu_model_item_get_attribute (item, G_MENU_ATTRIBUTE_TARGET, "s", &target);
+          g_menu_model_get_item_attribute (model, item, G_MENU_ATTRIBUTE_TARGET, "s", &target);
           a->target = g_strdup (target);
           v = g_action_group_get_action_state (group, action);
           gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w),
@@ -295,7 +296,6 @@ append_items_from_model (GtkWidget    *menu,
   GtkWidget *w;
   GtkWidget *menuitem;
   GtkWidget *submenu;
-  GMenuModelItem item;
   GMenuModel *m;
 
   n = g_menu_model_get_n_items (model);
@@ -311,18 +311,16 @@ append_items_from_model (GtkWidget    *menu,
 
   for (i = 0; i < n; i++)
     {
-      g_menu_model_get_item (model, i, &item);
-
-      if ((m = g_menu_model_item_get_link (&item, G_MENU_LINK_SECTION)))
+      if ((m = g_menu_model_get_item_link (model, i, G_MENU_LINK_SECTION)))
         {
           append_items_from_model (menu, m, group, need_separator);
           g_object_unref (m);
           continue;
         }
 
-      menuitem = create_menuitem_from_model (&item, group);
+      menuitem = create_menuitem_from_model (model, i, group);
 
-      if ((m = g_menu_model_item_get_link (&item, G_MENU_LINK_SUBMENU)))
+      if ((m = g_menu_model_get_item_link (model, i, G_MENU_LINK_SUBMENU)))
         {
           submenu = create_menu_from_model (m, group);
           gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);